baml_language/crates/baml_fmt/src/ast/expressions.rs (1)

1811-1817: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Extract the repeated braceless-jump check into a helper.

The same matches!(&self.body, Expression::Return(_) | Expression::Break(_) | Expression::Continue(_)) check is duplicated three times (MatchArm twice, CatchArm once). A small helper, e.g. Expression::needs_stmt_semicolon(&self) -> bool, would avoid the triple duplication and reduce risk of the checks drifting apart if a fourth jump kind is added later.

♻️ Proposed refactor

+impl Expression {
+    /// Whether this braceless jump (`return`/`break`/`continue`) requires an
+    /// explicit `;` when wrapped into a block by an arm printer.
+    pub(crate) fn needs_stmt_semicolon(&self) -> bool {
+        matches!(
+            self,
+            Expression::Return(_) | Expression::Break(_) | Expression::Continue(_)
+        )
+    }
+}

Then replace each of the three matches! call sites with self.body.needs_stmt_semicolon().

Also applies to: 1880-1886, 2283-2289

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@baml_language/crates/baml_fmt/src/ast/expressions.rs` around lines 1811 -
1817, The braceless-jump semicolon check is duplicated across MatchArm and
CatchArm, so extract it into a shared helper on Expression such as
needs_stmt_semicolon() that encapsulates the Return/Break/Continue match. Then
replace each repeated matches! call site in MatchArm and CatchArm with the new
helper so the logic stays consistent if jump kinds change later.

baml_language/crates/baml_fmt/src/ast/expressions.rs (1)

69-84: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Doc comment doesn't mention new Break/Continue variants.

The VerbatimSpan doc comment at Lines 69-73 still only calls out Expression::Unknown and Expression::Return as the variants it backs, even though Expression::Break/Expression::Continue are now also backed by it (Lines 62, 65).

📝 Suggested doc tweak

-/// last *token* ranges. The trivia classifier keys leading/trailing comments to
-/// individual token ranges, so [`Printable::leftmost_token`] /
-/// [`Printable::rightmost_token`] must return those exact token ranges for a
-/// comment to attach and emit. A whole-node span never matches a token key, so
-/// a trailing comment on the node was silently dropped — the `defer` statement
-/// comment-loss bug (B-629), and the same class of bug for a braceless `return`
-/// arm. A whole-node span can also begin inside leading trivia (the parser
+/// last *token* ranges. The trivia classifier keys leading/trailing comments to
+/// individual token ranges, so [`Printable::leftmost_token`] /
+/// [`Printable::rightmost_token`] must return those exact token ranges for a
+/// comment to attach and emit. A whole-node span never matches a token key, so
+/// a trailing comment on the node was silently dropped — the `defer` statement
+/// comment-loss bug (B-629), and the same class of bug for a braceless
+/// `return`/`break`/`continue` arm. A whole-node span can also begin inside leading trivia (the parser

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@baml_language/crates/baml_fmt/src/ast/expressions.rs` around lines 69 - 84,
Update the `VerbatimSpan` doc comment in `baml_fmt::ast::expressions` so it also
mentions the new `Expression::Break` and `Expression::Continue` variants
alongside `Expression::Unknown` and `Expression::Return`; keep the explanation
about token-range-based printing and leading/trailing trivia handling, but make
the list of backed variants complete so it matches the current `Expression`
enum.